Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Comment field merge #12

Closed
wants to merge 821 commits into from
Closed

Comment field merge #12

wants to merge 821 commits into from

Conversation

larowlan
Copy link
Contributor

This is just to make reviewing easier, no need to merge
See
http://drupal.org/node/1907960 and
http://drupal.org/node/731724

alexpott and others added 30 commits July 19, 2013 15:14
Conflicts:
	core/includes/theme.inc
	core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php
Conflicts:
	core/modules/comment/comment.module
	core/modules/comment/comment.pages.inc
	core/modules/comment/comment.tokens.inc
	core/modules/comment/lib/Drupal/comment/CommentFormController.php
	core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentAdminTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentAnonymousTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentCSSTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentInterfaceTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentLanguageTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentLinksTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentNewIndicatorTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentNodeAccessTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentPagerTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentStatisticsTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentTestBase.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentThreadingTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentTokenReplaceTest.php
	core/modules/comment/lib/Drupal/comment/Tests/CommentTranslationUITest.php
	core/modules/comment/lib/Drupal/comment/Tests/Views/CommentTestBase.php
	core/modules/comment/lib/Drupal/comment/Tests/Views/DefaultViewRecentComments.php
	core/modules/entity_reference/lib/Drupal/entity_reference/Tests/EntityReferenceSelectionAccessTest.php
	core/modules/forum/forum.module
	core/modules/forum/lib/Drupal/forum/Tests/ForumBlockTest.php
	core/modules/node/lib/Drupal/node/Tests/NodeAccessPagerTest.php
	core/modules/node/lib/Drupal/node/Tests/NodeTitleTest.php
	core/modules/node/node.api.php
	core/modules/rdf/lib/Drupal/rdf/Tests/TrackerAttributesTest.php
	core/modules/search/lib/Drupal/search/Tests/SearchCommentCountToggleTest.php
	core/modules/search/lib/Drupal/search/Tests/SearchCommentTest.php
	core/modules/search/lib/Drupal/search/Tests/SearchRankingTest.php
	core/modules/system/lib/Drupal/system/Tests/Entity/EntityBCDecoratorTest.php
	core/modules/system/lib/Drupal/system/Tests/Theme/EntityFilteringThemeTest.php
	core/modules/tracker/lib/Drupal/tracker/Tests/TrackerTest.php
	core/modules/tracker/tracker.pages.inc
	core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php
	core/modules/user/lib/Drupal/user/Tests/UserPictureTest.php
	core/modules/user/lib/Drupal/user/Tests/UserSignatureTest.php
	core/modules/views/lib/Drupal/views/Tests/DefaultViewsTest.php
	core/profiles/standard/config/rdf.mapping.comment.comment_node_article.yml
Conflicts:
	core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationSettingsTest.php
	core/modules/file/lib/Drupal/file/Tests/FileFieldWidgetTest.php
…from /core/modules/locale/lib/Drupal/locale/LocaleConfigManager.php.
…ty for creating unique config id/machine name off of (views) block plugins and onto BlockFormController.
@mikl
Copy link

mikl commented Sep 29, 2013

Ok, do you mind if I close it? It should still keep functioning.

@larowlan
Copy link
Contributor Author

Please close thanks
On 30/09/2013 3:38 AM, "Mikkel Høgh" notifications@github.com wrote:

Ok, do you mind if I close it? It should still keep functioning.


Reply to this email directly or view it on GitHubhttps://github.com//pull/12#issuecomment-25324851
.

@mikl mikl closed this Sep 29, 2013
pdrakeweb pushed a commit to pdrakeweb/drupal-1 that referenced this pull request Apr 30, 2014
Persist the connection for multiple solr queries
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
5 participants